Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support captcha action in wafv2 rule group #28435

Merged
merged 6 commits into from
Dec 23, 2022
Merged

Support captcha action in wafv2 rule group #28435

merged 6 commits into from
Dec 23, 2022

Conversation

bigwheel
Copy link
Contributor

@bigwheel bigwheel commented Dec 17, 2022 •
edited
Loading

Description

#21766 added captcha action to wafv2 acl but rule group were left.
This PR adds functionality to support captcha action in wafv2 rule group.

Relations

Nothing

References

AWS WAF adds support for Captcha

Output from Acceptance Testing

❯ AWS_PROFILE=default make testacc TESTARGS='-run=TestAccWAFV2RuleGroup_' PKG_NAME=internal/service/wafv2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/wafv2/... -v -count 1 -parallel 20  -run=TestAccWAFV2RuleGroup_ -timeout 180m

...

--- PASS: TestAccWAFV2RuleGroup_RateBased_maxNested (112.99s)
--- PASS: TestAccWAFV2RuleGroup_Operators_maxNested (115.98s)
--- PASS: TestAccWAFV2RuleGroup_basic (131.95s)
--- PASS: TestAccWAFV2RuleGroup_disappears (138.66s)
--- PASS: TestAccWAFV2RuleGroup_changeMetricNameForceNew (148.01s)
--- PASS: TestAccWAFV2RuleGroup_changeNameForceNew (153.55s)
--- PASS: TestAccWAFV2RuleGroup_changeCapacityForceNew (170.11s)
--- PASS: TestAccWAFV2RuleGroup_ipSetReferenceStatement (187.37s)
--- PASS: TestAccWAFV2RuleGroup_xssMatchStatement (215.64s)
--- PASS: TestAccWAFV2RuleGroup_byteMatchStatement (218.18s)
--- PASS: TestAccWAFV2RuleGroup_RuleLabels (257.61s)
--- PASS: TestAccWAFV2RuleGroup_LabelMatchStatement (282.50s)
--- PASS: TestAccWAFV2RuleGroup_sizeConstraintStatement (284.15s)
--- PASS: TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP (292.75s)
--- PASS: TestAccWAFV2RuleGroup_geoMatchStatement (295.96s)
--- PASS: TestAccWAFV2RuleGroup_regexMatchStatement (141.99s)
--- PASS: TestAccWAFV2RuleGroup_minimal (99.38s)
--- PASS: TestAccWAFV2RuleGroup_regexPatternSetReferenceStatement (133.99s)
--- PASS: TestAccWAFV2RuleGroup_logicalRuleStatements (329.07s)
--- PASS: TestAccWAFV2RuleGroup_sqliMatchStatement (230.60s)
--- PASS: TestAccWAFV2RuleGroup_updateRule (229.27s)
--- PASS: TestAccWAFV2RuleGroup_updateRuleProperties (361.53s)
--- PASS: TestAccWAFV2RuleGroup_rateBasedStatement (364.40s)
--- PASS: TestAccWAFV2RuleGroup_RuleAction_customRequestHandling (214.92s)
--- PASS: TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP (377.61s)
--- PASS: TestAccWAFV2RuleGroup_tags (278.28s)
--- PASS: TestAccWAFV2RuleGroup_ruleAction (265.25s)
--- PASS: TestAccWAFV2RuleGroup_RuleAction_customResponse (258.03s)
--- PASS: TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch (657.49s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/wafv2      657.587s

@github-actions
Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added size/S Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. documentation Introduces or discusses updates to documentation. service/wafv2 Issues and PRs that pertain to the wafv2 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 17, 2022
@bigwheel bigwheel marked this pull request as ready for review December 17, 2022 14:46
@bigwheel
Copy link
Contributor Author

P.S.

I tested captcha rule group in my sandbox and it creates captcha rule group successfully.

resource "aws_wafv2_rule_group" "example" {
  name     = "disposable-test-20221213"
  scope    = "REGIONAL"
  capacity = 2

  rule {
    name     = "for-terraform-aws-provider-development"
    priority = 1

    action {
      captcha {}
    }

    statement {

      geo_match_statement {
        country_codes = ["US", "NL"]
      }
    }

    visibility_config {
      cloudwatch_metrics_enabled = false
      metric_name                = "friendly-rule-metric-name"
      sampled_requests_enabled   = false
    }
  }

  visibility_config {
    cloudwatch_metrics_enabled = false
    metric_name                = "friendly-metric-name"
    sampled_requests_enabled   = false
  }
}

@ewbankkit ewbankkit removed the needs-triage Waiting for first response or review from a maintainer. label Dec 23, 2022
ewbankkit
ewbankkit approved these changes Dec 23, 2022
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccWAFV2RuleGroup_' PKG=wafv2 ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/wafv2/... -v -count 1 -parallel 3  -run=TestAccWAFV2RuleGroup_ -timeout 180m
=== RUN   TestAccWAFV2RuleGroup_basic
=== PAUSE TestAccWAFV2RuleGroup_basic
=== RUN   TestAccWAFV2RuleGroup_updateRule
=== PAUSE TestAccWAFV2RuleGroup_updateRule
=== RUN   TestAccWAFV2RuleGroup_updateRuleProperties
=== PAUSE TestAccWAFV2RuleGroup_updateRuleProperties
=== RUN   TestAccWAFV2RuleGroup_byteMatchStatement
=== PAUSE TestAccWAFV2RuleGroup_byteMatchStatement
=== RUN   TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch
=== PAUSE TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch
=== RUN   TestAccWAFV2RuleGroup_changeNameForceNew
=== PAUSE TestAccWAFV2RuleGroup_changeNameForceNew
=== RUN   TestAccWAFV2RuleGroup_changeCapacityForceNew
=== PAUSE TestAccWAFV2RuleGroup_changeCapacityForceNew
=== RUN   TestAccWAFV2RuleGroup_changeMetricNameForceNew
=== PAUSE TestAccWAFV2RuleGroup_changeMetricNameForceNew
=== RUN   TestAccWAFV2RuleGroup_disappears
=== PAUSE TestAccWAFV2RuleGroup_disappears
=== RUN   TestAccWAFV2RuleGroup_RuleLabels
=== PAUSE TestAccWAFV2RuleGroup_RuleLabels
=== RUN   TestAccWAFV2RuleGroup_geoMatchStatement
=== PAUSE TestAccWAFV2RuleGroup_geoMatchStatement
=== RUN   TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP
=== PAUSE TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP
=== RUN   TestAccWAFV2RuleGroup_LabelMatchStatement
=== PAUSE TestAccWAFV2RuleGroup_LabelMatchStatement
=== RUN   TestAccWAFV2RuleGroup_ipSetReferenceStatement
=== PAUSE TestAccWAFV2RuleGroup_ipSetReferenceStatement
=== RUN   TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP
=== PAUSE TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP
=== RUN   TestAccWAFV2RuleGroup_logicalRuleStatements
=== PAUSE TestAccWAFV2RuleGroup_logicalRuleStatements
=== RUN   TestAccWAFV2RuleGroup_minimal
=== PAUSE TestAccWAFV2RuleGroup_minimal
=== RUN   TestAccWAFV2RuleGroup_regexMatchStatement
=== PAUSE TestAccWAFV2RuleGroup_regexMatchStatement
=== RUN   TestAccWAFV2RuleGroup_regexPatternSetReferenceStatement
=== PAUSE TestAccWAFV2RuleGroup_regexPatternSetReferenceStatement
=== RUN   TestAccWAFV2RuleGroup_ruleAction
=== PAUSE TestAccWAFV2RuleGroup_ruleAction
=== RUN   TestAccWAFV2RuleGroup_RuleAction_customRequestHandling
=== PAUSE TestAccWAFV2RuleGroup_RuleAction_customRequestHandling
=== RUN   TestAccWAFV2RuleGroup_RuleAction_customResponse
=== PAUSE TestAccWAFV2RuleGroup_RuleAction_customResponse
=== RUN   TestAccWAFV2RuleGroup_sizeConstraintStatement
=== PAUSE TestAccWAFV2RuleGroup_sizeConstraintStatement
=== RUN   TestAccWAFV2RuleGroup_sqliMatchStatement
=== PAUSE TestAccWAFV2RuleGroup_sqliMatchStatement
=== RUN   TestAccWAFV2RuleGroup_tags
=== PAUSE TestAccWAFV2RuleGroup_tags
=== RUN   TestAccWAFV2RuleGroup_xssMatchStatement
=== PAUSE TestAccWAFV2RuleGroup_xssMatchStatement
=== RUN   TestAccWAFV2RuleGroup_rateBasedStatement
=== PAUSE TestAccWAFV2RuleGroup_rateBasedStatement
=== RUN   TestAccWAFV2RuleGroup_RateBased_maxNested
=== PAUSE TestAccWAFV2RuleGroup_RateBased_maxNested
=== RUN   TestAccWAFV2RuleGroup_Operators_maxNested
=== PAUSE TestAccWAFV2RuleGroup_Operators_maxNested
=== CONT  TestAccWAFV2RuleGroup_basic
=== CONT  TestAccWAFV2RuleGroup_logicalRuleStatements
=== CONT  TestAccWAFV2RuleGroup_disappears
--- PASS: TestAccWAFV2RuleGroup_disappears (21.53s)
=== CONT  TestAccWAFV2RuleGroup_Operators_maxNested
--- PASS: TestAccWAFV2RuleGroup_basic (27.63s)
=== CONT  TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP
--- PASS: TestAccWAFV2RuleGroup_Operators_maxNested (30.24s)
=== CONT  TestAccWAFV2RuleGroup_ipSetReferenceStatement
--- PASS: TestAccWAFV2RuleGroup_logicalRuleStatements (82.85s)
=== CONT  TestAccWAFV2RuleGroup_LabelMatchStatement
--- PASS: TestAccWAFV2RuleGroup_ipSetReferenceStatement (35.12s)
=== CONT  TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP
--- PASS: TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP (105.41s)
=== CONT  TestAccWAFV2RuleGroup_RateBased_maxNested
--- PASS: TestAccWAFV2RuleGroup_LabelMatchStatement (50.70s)
=== CONT  TestAccWAFV2RuleGroup_geoMatchStatement
--- PASS: TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP (51.40s)
=== CONT  TestAccWAFV2RuleGroup_rateBasedStatement
--- PASS: TestAccWAFV2RuleGroup_RateBased_maxNested (31.46s)
=== CONT  TestAccWAFV2RuleGroup_RuleLabels
--- PASS: TestAccWAFV2RuleGroup_geoMatchStatement (53.39s)
=== CONT  TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch
--- PASS: TestAccWAFV2RuleGroup_RuleLabels (51.37s)
=== CONT  TestAccWAFV2RuleGroup_changeMetricNameForceNew
--- PASS: TestAccWAFV2RuleGroup_rateBasedStatement (96.28s)
=== CONT  TestAccWAFV2RuleGroup_xssMatchStatement
--- PASS: TestAccWAFV2RuleGroup_changeMetricNameForceNew (43.50s)
=== CONT  TestAccWAFV2RuleGroup_changeCapacityForceNew
--- PASS: TestAccWAFV2RuleGroup_xssMatchStatement (48.59s)
=== CONT  TestAccWAFV2RuleGroup_tags
--- PASS: TestAccWAFV2RuleGroup_changeCapacityForceNew (44.22s)
=== CONT  TestAccWAFV2RuleGroup_changeNameForceNew
--- PASS: TestAccWAFV2RuleGroup_changeNameForceNew (43.60s)
=== CONT  TestAccWAFV2RuleGroup_ruleAction
--- PASS: TestAccWAFV2RuleGroup_tags (64.30s)
=== CONT  TestAccWAFV2RuleGroup_sizeConstraintStatement
--- PASS: TestAccWAFV2RuleGroup_sizeConstraintStatement (47.01s)
=== CONT  TestAccWAFV2RuleGroup_RuleAction_customResponse
--- PASS: TestAccWAFV2RuleGroup_ruleAction (69.61s)
=== CONT  TestAccWAFV2RuleGroup_RuleAction_customRequestHandling
--- PASS: TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch (272.54s)
=== CONT  TestAccWAFV2RuleGroup_sqliMatchStatement
--- PASS: TestAccWAFV2RuleGroup_RuleAction_customResponse (68.90s)
=== CONT  TestAccWAFV2RuleGroup_regexPatternSetReferenceStatement
--- PASS: TestAccWAFV2RuleGroup_RuleAction_customRequestHandling (47.50s)
=== CONT  TestAccWAFV2RuleGroup_updateRuleProperties
--- PASS: TestAccWAFV2RuleGroup_regexPatternSetReferenceStatement (27.25s)
=== CONT  TestAccWAFV2RuleGroup_regexMatchStatement
--- PASS: TestAccWAFV2RuleGroup_sqliMatchStatement (47.30s)
=== CONT  TestAccWAFV2RuleGroup_byteMatchStatement
--- PASS: TestAccWAFV2RuleGroup_regexMatchStatement (26.92s)
=== CONT  TestAccWAFV2RuleGroup_updateRule
--- PASS: TestAccWAFV2RuleGroup_updateRuleProperties (74.55s)
=== CONT  TestAccWAFV2RuleGroup_minimal
--- PASS: TestAccWAFV2RuleGroup_byteMatchStatement (51.20s)
--- PASS: TestAccWAFV2RuleGroup_minimal (22.34s)
--- PASS: TestAccWAFV2RuleGroup_updateRule (48.60s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/wafv2	573.272s

@ewbankkit
Copy link
Contributor

@bigwheel Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 49ebe0f into hashicorp:main Dec 23, 2022
@github-actions github-actions bot added this to the v4.49.0 milestone Dec 23, 2022
@bigwheel bigwheel deleted the ftd-support-captcha-in-wafv2-rule-group branch December 25, 2022 23:51
@github-actions
Copy link

github-actions bot commented Jan 5, 2023

This functionality has been released in v4.49.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions
Copy link

github-actions bot commented Feb 5, 2023

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. service/wafv2 Issues and PRs that pertain to the wafv2 service. size/S Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v4.49.0
Development

Successfully merging this pull request may close these issues.
2 participants
@bigwheel @ewbankkit